#include <my_header.h>

/* Usage:  */
int main(int argc, char *argv[]){                                  
<<<<<<< HEAD
    printf("master test1\n");
=======
    printf("test branch\n");
>>>>>>> test2
    return 0;
}

